From 10bc71a5e6bcd2f214230b670e4505ce4a2f2306 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 11 Jan 2017 15:17:49 +0100 Subject: [PATCH] build: List resource files explicitly This way, we ensure that files that are built during make always get properly listed. And we ensure that creating the resources actually depends on them. --- gsk/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gsk/Makefile.am b/gsk/Makefile.am index e74529c806..d665e1d1a2 100644 --- a/gsk/Makefile.am +++ b/gsk/Makefile.am @@ -172,7 +172,10 @@ gskenumtypes.c: $(gsk_public_source_h) gskenumtypes.c.template EXTRA_DIST += gskenumtypes.h.template gskenumtypes.c.template DISTCLEANFILES += gskenumtypes.h gskenumtypes.c -resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/gsk.resources.xml) +resource_files = \ + $(gsk_private_source_shaders) \ + $(gsk_private_vulkan_compiled_shaders) \ + $(gsk_private_vulkan_shaders) resources/vulkan/%.frag.spv: resources/vulkan/%.frag.glsl @if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi @@ -201,7 +204,7 @@ gsk.resources.xml: Makefile.am echo " " >> $@; \ echo "" >> $@ -gskresources.h: gsk.resources.xml +gskresources.h: gsk.resources.xml $(resource_files) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \ --target=$@ --sourcedir=$(srcdir) --c-name _gsk --generate-header --manual-register -- 2.30.2